Updated to remove unused Context