remove unused method
organise code