feature cleanup and demo