Refactors and remove generated data