Cleanup in Parameters.h