Remove code duplications

Version already bumped to 0.2.5