removed useless boolean