Removal of old code, some to comments