Removed includes and requires