Part 5.3: Some comments + some dead code removed