Removed code for further testing