some hard code remove