- remove duplicated method declarations - remove unused vars - fix docs Change-Id: If796e368e025a526946179cb418d06919707439d