bugfix + removal of uneeded file