removing redundant stuff

- Remove rotten/commented code