removing duplicate code for 2.0 release
cleanup