new cleaner code (removed todos) for system