fixing minifcation conflicts
cleanup