Removed less stuff