Remove accidental sun proprietary import and upgrade dependencies