Deleted some obsolete stuff