some heavy handed cleanup to simplify Ubuntu install