Analytics tied in and sited cleaned up