Even more clenaup