removed some older stuff