cleaned up unneeded error handling