Cleaned up deprecated usages