Fixed and removed unused code
Updated README