remove raiicontext and replace close() calls

remove raiicontext and replace close() calls #533