MOD: Just some cleaning