Refactor: Tidy up of unused items and addition of finals