Cleanup: removed unneccessary code.