Moved some non-used code to another package for possible future use.