Merge "Tidy up unused code / unnecessary logic"