Cleanup + replace deprecated method