Cleanup.

Less fiddling with new tech, moar development on the actual project.