Updated error handeling
removed superfulous files