Remove delivery

Run tests and merge!