Cleanup: Removed redundant code