removal of some debug lines and simple adjustments
remove invalid classes and adjustments of the api changes