Cleanup up plovr build for image module