Removed leftover clear property, moved clear bool to local scope