Changed some of the panics to normal error messages
Got rid of unused file