Code cleanup

Ah, will remove those then.