Remove hardcoded self