Clean up aspen launching

This is waiting on #2113