Some cleaning up -- lots more to do