cleanup and attempted fix