Removed old code
Bugfixes