some cleanup of last commit