Clean up and add sample data install