Removed code until complete