removed extra classes for now - problems with building need to be sorted out