Replace deprecated methods, clean up