Up version for development
Remove duplicated code