Remove empty module
Make functions work on a typeclassed environment