Removed old vector class and marked TODO