Remove commmented/obsolete code again