Remove substring causing me trouble ><