Delete unneeded stuff, fix refreshing issue