Removed things that were not necessary