Removed some confusing docs and logic