Remove redundant semicolons after function definitions

Change-Id: I7ae48031a0b09a7ec103ce6e56f044afc3bcc384