Removed things that were causing errors