Lint fixes and comment out unrunnable code