Cleanup package and cmake files