Code optimization, removing unused items...