clean up and switch to simple launcher