Removed legacy code etc.