Code

cleanup (remove obsolete code)