Removed superfluous logic and bump version