We can leave this as is and I will find out a way to get rid of those. :)