Adding some cleaning to account