Removed comments and unused functions.