Modified install checks
Modified install checks. Clean up