make common core.ngp bundle and clean up a little bit