Various fixes!

Removed a damaged Part of code!