Cleaned up some stuff from transition