Removed unused code segments
Removed code that doesn't work

Added description of future task