more clean up, added time out