Fix compiler warning. Get rid of some obsolete commented-out code
Get the Component pieces to at least pretend they work