Removed some obsolete stuff