Remove comments and comment out implemented parts