Removed some of the unecessary tables...