remove redundant code and files