Cleanup on parameterUtilities