second cleanup commit to deal with eclipse's stupidity