some cleanup. No fix
Merged code cleanup