cleaned up some useless refs