clean up, simplify some things and remove requirement for empty clip columns