clean up hard code hack