bs:050214, Implemented TB's simpler gsub formatting

Ok, finished implementing TB's gsub formating. Seems to be working.
Cleaned up the dead methods and misc.