Code cleanup (removal of old code snippets)