cleanup - removed unneeded code