Added cleanup code for after install