Cleanup and a new fix that seesm to wok