Moved deprecated stuff to deprecated