Add usefull comments, remove unused method