Removing unused (but potentially helpful code)