Use Helper.close() methods when possible

Signed-off-by: Frca <killerfrca@gmail.com>