Removed everythign that should not be there I believe