Removed some redundant code on request from @prabirshrestha :sparkles: