Removed some comments and unused functions.