Unwanted hardcoded removed