deleted a whole crapton of fucntionality