Remove old unnecessary stuff