Cleanup for comments and useless functions