Cleaned up deprecated functions