Removed include code in classes