Removed self references as they were no longer neeeded