some cleanup and aiming to get an integration test goin