Removed it back to the barebones