more cleanup & removing unused stuff.