some cleanup, we do not need testing