Cleaning out to make way for better line sensor code

This reverts commit b99584d08cec4506829a073f2fd89c7614d173de.