removing obsolete code / cleaning up