Cleaned up installation routine order for virtual and local installs
Updated remove-install