Cleaned up deprecated methods