Cleaned up not in use refs