Deleted some stuff to make things more organized