removed ugly obsolete stuff