Got rid of unecessary table