Clean up application helper and specs