changes and remove old stuffs