info refactoring
cleaned up unused stuff