Remove unused whirr junk
add apache license 2