Removed extra tables