Cleaning code/page in few places