Alot of cleanup for vanilla core. More clean up to come.
More compile errors to clean up to come.