clean some mess
remove prefix