Removed no longer used code