CMakeLists updated
Removed unused fields
Testing