Cleaned up CMake definitions
Removed undeeded cmake modules