Clean old unnecessary code out