bugfixes,dead-code elimination,code-cleanup