Removed includes and stuff