Clean up lights module code.

Change-Id: Ic195efafde9dba965727d055576df5f6b2a1431b