Removing placeholder handling