Fixed refs again -commented out broken code