skate: cleanups

Change-Id: I3fd9adb2fbd3f831dfd6e3c23fdbb1d48ba4f1b7