cleanup of lotsa stuff