Remove unused bits

This commit removes parts that have been commented out since the
initial commit. If anyone needs them later, they are commited and
can be looked up using Git anyway.