Mess around the reverting stuff cleaned