Clean up hadoop modifications specific to Portico