Removing the obsolete stuff