Hypre support, cmake file cleaning