cleaning up old structure