Removed all the old code