Add version call
Remove unuseful code