Removing some unnecessary comments and usings.