Remove or move java.awt dependencies