Got rid of leftover code from derivative branch