Cleaned out old, buggy OC stuff.