Cleanup: removed old methods