Cleanup, still fixing sync