Remove unnecessary after restructure