cleaning up rebuild mess