remove commented out code as its now unused