CR change: got rid of some unnecessary stuff