fix lingering issues, remove commenting