Remove stuff that do not belong here