STY: Cleanup unneeded code