some cleanup for commit