cleanup code for last commit