Removed some unnecessary includes, and an if statement.