massive code cleanup, moved to cmake/make
cleanup