further cleanup & db cache added