Removed deprecated method calls and class imports