cleaned up old structure