clean up unused method
better version