removed stuff moved to images, fixed related bug