Removing SKIP type checks and commenting others out