Some general cleanings.

Check if it didn't cause any trouble