Removing few more things