Extract some more methods and other tweaks
Stop tracking version in database