* cleanup imports,

 * cleanup imports,
 * remove some leftover code,
 * smaller speedups,
 * some formatting changes,
 * rely on base code instead of just copying it,
 * small fix for subservices,
 * not longer change local base timer if we set it to local (it will be kept without the changes though),
 * close editor when remote timer added successfully,
 * maybe some other stuff i either forgot about or am too lazy to mention (this message is way too long anyway)