removal works now
minor fixes