Remove tricky stuff(It's temporary code for refactoring)