WIP: Some more cleanup