ZER - Removed all old code