Removed dead code

Also more better sync ;)
More fixes for dead code.