Deleted comments and old code