Cleanup: removing redundant code