commit before deleting code :)
Removed unused code and changed visibilities