Add end_on_use property and clean up old properties no longer there