remove file. organize code