pollux: fix and cleanup

Change-Id: I7aa2d87d47fe117bb538b277c4c26f7d5e352c8c