Got rid of unused/unneeded code