Cleanup as things wernt working well