Cleanup: Remove deprecated code