Update Extends+libs to remove bad imports