Removed code currently causing issues