clean up some shader code

Change-Id: I137df102a8449a14697b0c28a718d7f55952fd27