Bugfixes
Removing garbage