Removed unnecessary functions from starter