cleanup from comments