Removed nonworking code