Removing unused functionality for a basic setup
Added testcase for indexing