cleanup code

Change-Id: I0fefbba3de9a9dc3406a2f613024efe5157ee500