Cleanup - removed unneeded code.