Relocate/delete old code