Removed dead and future code. Reference this commit if dead/ future code is needed later.