Tidied up unused #include and #defines in main