cleaned up, left just classes etc