cleaned up; moved stuff to deprecated; ran tests