removed oddbjørns stuff!