added contracts flag
cleanup