Misc: Some cleanup