Cleanup

Deleting unused code