Removal of old dev code