Removing unused injection, fixing small bugs related to the 'offline' marker