Some tidying up

Removing unused variables and methods