Comment out stuff we don't have nor need