remove vendor imports for Breakpoint and Singularity
comment cleanup