removed controls for the user (may lead to buggy sync), some refactoring