Removed useless comments and code