Removed disused methods. Update comments.