remove the accidently committed code cleanup changes in master branch