remove unused method

plus a few comments