Merge "Cleanup of redundant files from Prox directory"