#2. Cleaned up deprecated API