clean-up old warnings and errors erbs