Removed comments and todo