Code cleanup

Removing dead code (remains from untested features or not wanted in main
branch)