some cleanup. No fix