Dropped the old and redundant code