Removing unnecessary organization