remove old versions and refactor to new cleaner version