Removing version code, cleaning templates