Minor tidy up + removed some unsed methods