removed uneccessary code, removed donothing classes until later
forgot some stuff in debug, sorry