Removed usless code and comments.