Remove unneeded code and update story roadmap