cleaned up some code that should not still be there