cleanup

removed some redundant stuff.