Remove old before_filters
Update TODO