Stripped away not-working functionality in favor of moving forward.