bug fix & remove unused route