Moved the #Include's + deleted code