Started massive code cleaning spree!