Tidied up commented out code