More manual stuff clean up, c transformers clean up