Remove them from here too