removed unused #includes, removed namespace calls