Make more sane naming choices, remove useless stuff.