Remove comments and comment out implemented parts

Forgot one commit.