removed unused variables
sync namespace