Delete old version
Complete code refactor