Removed nodepoint and indicators