Removed 2 no-anymore-needed pieces of software