Cleans up #35