Cleanup

Remove some stuff and renamed another thing.
Updated min file.