[cleanup] necessary fixes to incorporate project