Clean code

Remove unnecessary comments and test cases used for debugging.