Get rit of old code