Remove old and commented code