Removed the self-executing functions