removed the commented bits