Cleanup: removed unneeded includes