+ Remove some "debug" code
+ Fix build files