Bugfixing + removing useless files