BUGFIX: -clean up project