Cleanup original code; remove 'virtus' gem as dependency