more cleaning up done