Removed and moved to class