deleted comments and uneeded code