Removed old code (as on branch supermaster), functionaly unchanged.