Removed deprecated getter/setter stuff