Deleted old, commented code