Removed Performance Code