STY: Clean up imports