Removed unnecessary stuff

TODO has been migrated to github issues