Remove unused marker
Remove unused variables