redundancy cleanup :)