Remove unecessary naming.