Cleaned up remove, started adding iterators/equal