Removed things we don't need and small fixes.