before merge
before merge
some cleanup