Deleted unused code and comments