Remove deprecated and rotten old code