remove unused file
Finish experimental refactoring