Sort/Format/Clean up imports/remove all deprecated methods.