Removed artifacts of initial implementation