Removed comments and todo's that don't apply to this project.