Removed superflous parts