final commit (more clean up)