Clean up and RWD