Removed all old code