More consistency and removed netbeans and gpm support.