Tidied up the carousel, removed loads of commented out code