More evolution fixes: Cleaned up roll-back and dropInstances()