Removed extraneous, not-fixed stuff