Remove dependencies on AWT