removing square and triangle stuff