cleaned up more completely, still not working