Clean up including removal of ENV var and pristined AutoGrader