remove m2 instances

@macumber 
updates to the instance types.  My editor also decided to fix a bunch of white spice too.