Removal of old code