Remove deprecated classes and organize imports