Removed useless structures