fixed part of the compilation
Removed now useless files.
Cleanup fixtures