remove context
empty path fix
cleanup
cleanup
more cleanup
commit macro