Cleanup

@owolabileg and @yzhang90, please review this clean-up change