Feature/remove extension

Not sure if this is a good idea, should probably be a post module process, that can deal with this in a more general way.