Removed redundant code, will be re-added later.