Removed superfluous functions