removing more bits of unfinished code that break the build... :(