Remove debugging, fix inheritance