Removing tests and classes - preparing for Volley approach