When I bought the bike and changed the oil, 4 litres came out!! Put back 2 litres of rotella, did not check the airbox.
The engine is being given the once-over for tensioner, petcock, cables etc., all the good stuff. May keep the stock air filter if K&N isn'treally necessary.
This forum is a major useful resource, Thanks all!