Clean-up

Lost some unsynced functionality